Merge version 1:20230101~dfsg-8+rpi1 and 1:20251009+git20260808~dfsg-2 to produce...

diff --cc debian/changelog
index 677270abb0c51f81879ff866877cc41bfda7a7c7,c93a4b23892c4f2e4242c1458c915d217150a436..4bb92e25adae689c8b8f6e88b91ff31c786be4d2
--- 1/debian/changelog
--- 2/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,30 +1,39 @@@
- fontforge (1:20230101~dfsg-8+rpi1) forky-staging; urgency=medium
++fontforge (1:20251009+git20260808~dfsg-2+rpi1) forky-staging; urgency=medium
 +
 +  [changes brought forward from 1:20190801~dfsg-4+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Wed, 01 Apr 2020 17:53:42 +0000]
 +  * Disable call to SplineFontFree in _MergeFont to work around use after
 +    free bug (see debian bug 948876).
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 22 May 2026 23:09:21 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Sun, 06 Sep 2026 14:19:57 +0000
++
+ fontforge (1:20251009+git20260808~dfsg-2) unstable; urgency=medium
+ 
+   * Team upload
+   * Add missing B-D: libcxxopts-dev
+ 
+  -- Bastian Germann <bage@debian.org>  Sat, 08 Aug 2026 15:14:17 +0200
+ 
+ fontforge (1:20251009+git20260808~dfsg-1) unstable; urgency=medium
+ 
+   * Team upload
+   * New upstream version 20251009+git20260808~dfsg
+   * Exclude multimastersubrs instead of patching (Closes: #665334)
+   * Exclude cxxopts
+   * Add Build-Depends: libgtkmm-3.0-dev
+   * Add Depends: unzip
+   * d/copyright: Update to new version
+   * Drop Depends: python3-pkg-resources (Closes: #1083402)
+ 
+  -- Bastian Germann <bage@debian.org>  Sat, 08 Aug 2026 13:38:02 +0200
+ 
+ fontforge (1:20230101~dfsg-9) unstable; urgency=medium
+ 
+   * Team upload
+   * Make afm and pfb timezone-independent (Closes: #1142495)
+   * lintian: Drop alien tag
+ 
+  -- Bastian Germann <bage@debian.org>  Tue, 28 Jul 2026 18:47:51 +0200
  
  fontforge (1:20230101~dfsg-8) unstable; urgency=medium
  

diff --cc debian/patches/series
index 9513a91f8445e7da043b00e6415d894b16a317e7,3910d8da384d7b35242d775c819f82a6b22b22fc..8cb49e433a6f86609c9af4984fe9722c220ad940
--- 1/debian/patches/series
--- 2/debian/patches/series
+++ b/debian/patches/series
@@@ -1,8 -1,6 +1,7 @@@
+ 0001-Exclude-cxxopts.patch
  0002-remove-custom-library-search-path.patch
  0003-use-local-libjs-mathjax.patch
- 0004-Drop-non-free-multiple-master-font-code.patch
+ 0005-afm-and-pfb-timezone-independent.patch
  2003_avoid_privacy_breach.patch
  2004-fix-privacy-breach-logo.patch
- 0001-fix-splinefont-shell-command-injection-5367.patch
- 0006-Update-po-files-from-Croudin-sources-after-fixing-pr.patch
 +4000-use-after-free-hack.patch

diff --cc debian/rules
Simple merge

diff --cc fontforge/fvfonts.c
Simple merge